The Everlasting Promised Reagent Fire at the End of the Horizon - #5951
Open
wonderfulnewworld wants to merge 37 commits into
Conversation
* Port clothing stains * fixing stuff * check this shi * le fix * spelling mistake * Apply suggestions from code review Co-authored-by: Centronias <charlie.t.santos@gmail.com> Signed-off-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> * some of LE fixes * Fixes * Spilling fixes * explaining comment * Cleaning up shit * Guard comments * Update Resources/Prototypes/Research/civilianservices.yml Signed-off-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> * Update Resources/Prototypes/Recipes/Lathes/Packs/service.yml Co-authored-by: Nyxilath <colton.malone@gmail.com> Signed-off-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> * Update Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml Co-authored-by: Nyxilath <colton.malone@gmail.com> Signed-off-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> * Update Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml Co-authored-by: Nyxilath <colton.malone@gmail.com> Signed-off-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> --------- Signed-off-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> Co-authored-by: MaiaArai <158123176+YaraaraY@users.noreply.github.com> Co-authored-by: Centronias <charlie.t.santos@gmail.com> Co-authored-by: Nyxilath <colton.malone@gmail.com> # Conflicts: # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/_Starlight/Medical/Body/Systems/SharedBloodstreamSystem.cs # Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml # Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml # Resources/Prototypes/Recipes/Lathes/Packs/service.yml # Resources/Prototypes/_Funkystation/Entities/Objects/Devices/Circuitboards/Machine/production.yml # Resources/Prototypes/_Funkystation/Recipes/Lathes/machine_boards.yml
* Small Stain Adjustments * yeah * guard? guard... Probably not nessessary but im porting a bunch of shit with this * Requested changes * Misc fixes * DOY DOY DOY DOY DOY * gravbob * going crazy * Network puddles properly, handle transfers properly too * No sound * Do it at the puddle * The exact location * tweak stain volume * Apply suggestions from code review Co-authored-by: Centronias <charlie.t.santos@gmail.com> Signed-off-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> * maybe this will fix it? --------- Signed-off-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> Co-authored-by: Centronias <charlie.t.santos@gmail.com> # Conflicts: # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Shared/Fluids/SharedPuddleSystem.cs
* Footprints! (ss14Starlight#125) * footprints * oops * commented upstream yamls * Fixes * THIS SUCKS * pain * fuck * Guard comments and misc stuff * Boom * Update Content.Server/Fluids/EntitySystems/PuddleSystem.cs Signed-off-by: StudMuffin <casalebalthazar@gmail.com> * Small Stain Adjustments * yeah * guard? guard... Probably not nessessary but im porting a bunch of shit with this * Move to shared * frustration * Guh * fuck it * Requested changes * Misc fixes * DOY DOY DOY DOY DOY * gravbob * its peak * going crazy * Network puddles properly, handle transfers properly too * No sound * Do it at the puddle * The exact location * bogos and binted linked up * Reduce print volume * PB and B * Fix audio * Userbob * pr comments * uno mas * rerun CI --------- Signed-off-by: StudMuffin <casalebalthazar@gmail.com> Co-authored-by: MaiaArai <158123176+YaraaraY@users.noreply.github.com> Co-authored-by: StudMuffin <casalebalthazar@gmail.com> Co-authored-by: Centronias <me@centronias.com> # Conflicts: # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Resources/Prototypes/Body/species_base.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
…hub.com/wonderfulnewworld/luminous-skylight-station into moff/shatter-the-twilight-reverie
* Predict washing machines * comment update
…hub.com/wonderfulnewworld/luminous-skylight-station into moff/shatter-the-twilight-reverie
…hub.com/wonderfulnewworld/luminous-skylight-station into moff/shatter-the-twilight-reverie
…hub.com/wonderfulnewworld/luminous-skylight-station into moff/shatter-the-twilight-reverie
…rfulnewworld/luminous-skylight-station into moff/after-all-this-time-finally-stains
…hub.com/wonderfulnewworld/luminous-skylight-station into moff/shatter-the-twilight-reverie
…ht#127) * reagent fires, flammable clothing stains, firelock fix * i love you yaml linter * fix a crash when fires delete entities * weird fire sprite darkspot on state six fixed * firelock buildtest fix * commented funky changes
# Conflicts: # Content.Shared/_Starlight/Medical/Body/Systems/SharedBloodstreamSystem.cs # Resources/Prototypes/_Funkystation/tags.yml
# Conflicts: # Resources/Prototypes/GameRules/events.yml
# Conflicts: # Content.Server/_Funkystation/ReagentFires/Systems/ReagentFireSystem.cs
…rfulnewworld/luminous-skylight-station into moff/after-all-this-time-finally-stains
…m/wonderfulnewworld/luminous-skylight-station into forky/the-everlasting-promised-reagent-fire-at-the-end-of-the-horizon
github-actions
Bot
added
S: Untriaged
Contributor
|
Important Review skippedToo many files! This PR contains 110 files, which is 10 over the limit of 100. To get a review, reduce the PR to 100 files or fewer by splitting it into smaller PRs or changing its base branch. Upgrade to a paid plan to raise the limit. This review couldn't start because sufficient usage credits or metered capacity aren't available. Add credits or update usage-based reviews in the billing tab, then retry. ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Team Run ID: ⛔ Files ignored due to path filters (54)
📒 Files selected for processing (110)
You can disable this status message by setting the Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
github-actions
Bot
added
Changes: UI
Changes: Sprites
Changes: Audio
Changes: C#
Changes: Prototypes
and removed
S: Needs Review
Contributor
Content + Integration Test ResultsFailed Tests
Github Test Reporter by CTRF 💚 🔄 This comment has been updated |
…rfulnewworld/luminous-skylight-station into moff/after-all-this-time-finally-stains
…hub.com/wonderfulnewworld/luminous-skylight-station into moff/shatter-the-twilight-reverie
…m/wonderfulnewworld/luminous-skylight-station into forky/the-everlasting-promised-reagent-fire-at-the-end-of-the-horizon
…ent-fire-at-the-end-of-the-horizon
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Short description
"Even against the incarnation of weakness, showing its face with a scream, I'll release everything right here and now: A Brand New World!"
Adds Reagent Fires to the game! Certain reagents, typically alcohol based, flammable in real life, or otherwise used for heating, are now flammable!
Alongside this, biggybacking off the clothing stains and footprints PRs that accompany this, you can now ignite the chemicals that get stuck on your clothes too, and footprints can also transfer fires if they're of flammable chemicals.
Furthermore, reagents can also be splashed onto walls now, and can also catch fire when done as such.
There's also a new event, rarer than gas leak, which will cause a fire somewhere on the station.
Fires can be extinguished with water or space cleaner, and some of them can also be extinguished in the absence of oxygen. (But not ALL of them. Some chemical fires are more dangerous than others...)
A lot of these features are server-side cvar modifiable too, in case they become too lethal.
Port of Forky Station #127, #153, #156, specifically this commit of #162, #164, and #187
Needs #5899, which needs #5898, which needs #5893.
Why we need to add this
More immersion, new features. No longer will throwing a lit welder over a gallon of fuel fail to do anything, and more things for Atmos to do too + new interactions for antags... it's a lot really, it's an entire fire system. You can do a lot with it.
Media (Video/Screenshots)
Content.Client_Pq6DsP0qcQ.webm
Checks
Changelog
🆑 wonderfulnewworld, YaraaraY